Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Add merge/unmerge loads feature. #131

Merged
merged 35 commits into from
Feb 17, 2023
Merged

Add merge/unmerge loads feature. #131

merged 35 commits into from
Feb 17, 2023

Conversation

dimbdr
Copy link
Contributor

@dimbdr dimbdr commented Nov 18, 2022

Please check if the PR fulfills these requirements (please use '[x]' to check the checkboxes, or submit the PR and then click the checkboxes)

  • The commit message follows our guidelines
  • Tests for the changes have been added (for bug fixes / features)

Does this PR already have an issue describing the problem ? If so, link to this issue using '#XXX' and skip the rest
fixes #122

What kind of change does this PR introduce? (Bug fix, feature, docs update, ...)
Proposal on how to merge/unmerge bunch of loads on a same bus in a network.

IIDM files used in tests have been updated as well.

Signed-off-by: BAUDRIER Dimitri <dimitri.baudrier@rte-france.com>
@dimbdr dimbdr changed the base branch from main to dynawaltz-maj-iidm-version November 21, 2022 16:45
There's a control on the network ID. A DynawoResultsMergeLoads is associated to a unique network via its ID.

Signed-off-by: BAUDRIER Dimitri <dimitri.baudrier@rte-france.com>
@dimbdr dimbdr removed the question Further information is requested label Nov 22, 2022
By default, the property mergeLoads is true.

Signed-off-by: BAUDRIER Dimitri <dimitri.baudrier@rte-france.com>
@dimbdr dimbdr force-pushed the merge-loads branch 3 times, most recently from d5c8c8f to 167abde Compare November 22, 2022 16:47
@dimbdr dimbdr requested a review from geofjamg November 23, 2022 14:02
@dimbdr dimbdr force-pushed the merge-loads branch 2 times, most recently from 27a5773 to d75b991 Compare November 23, 2022 16:29
Updated test resources, to compare results when the property mergeLoads is true

Signed-off-by: BAUDRIER Dimitri <dimitri.baudrier@rte-france.com>
@dimbdr dimbdr marked this pull request as ready for review November 24, 2022 12:09
Base automatically changed from dynawaltz-maj-iidm-version to main November 24, 2022 13:41
dimbdr and others added 3 commits November 24, 2022 14:50
@@ -177,6 +218,28 @@ public void testUpdate() throws Exception {
compare(expectedNetwork, network);
}

@Test
public void testUpdateWithMergeLoads() throws Exception {
Copy link
Contributor Author

@dimbdr dimbdr Nov 24, 2022

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I'm wondering.
I created this test, but is it really necessary to compare the network unmerged with the resource SmallBusBranch_outputIIDM.xml?
Since there are tests associated to the methods merge/unmerge (DynawoResultsMergeLoadsTest), and they are supposed to guarantee it works, then it should not be necessary to reconfirm the unmerge is successful when reading the network transformed into a xiidm file. I might be wrong.

Signed-off-by: BAUDRIER Dimitri <dimitri.baudrier@rte-france.com>
@flo-dup flo-dup force-pushed the merge-loads branch 6 times, most recently from ce77215 to 2db79ce Compare February 15, 2023 14:47
Signed-off-by: Florian Dupuy <florian.dupuy@rte-france.com>
Signed-off-by: Florian Dupuy <florian.dupuy@rte-france.com>
Signed-off-by: Florian Dupuy <florian.dupuy@rte-france.com>
Signed-off-by: Florian Dupuy <florian.dupuy@rte-france.com>
Signed-off-by: Florian Dupuy <florian.dupuy@rte-france.com>
Signed-off-by: Florian Dupuy <florian.dupuy@rte-france.com>
Signed-off-by: Florian Dupuy <florian.dupuy@rte-france.com>
Signed-off-by: Florian Dupuy <florian.dupuy@rte-france.com>
Signed-off-by: Florian Dupuy <florian.dupuy@rte-france.com>
Signed-off-by: Florian Dupuy <florian.dupuy@rte-france.com>
Signed-off-by: Florian Dupuy <florian.dupuy@rte-france.com>
Signed-off-by: Florian Dupuy <florian.dupuy@rte-france.com>
Signed-off-by: Florian Dupuy <florian.dupuy@rte-france.com>
Signed-off-by: Florian Dupuy <florian.dupuy@rte-france.com>
Signed-off-by: Florian Dupuy <florian.dupuy@rte-france.com>
Signed-off-by: Florian Dupuy <florian.dupuy@rte-france.com>
Signed-off-by: Florian Dupuy <florian.dupuy@rte-france.com>
@sonarqubecloud
Copy link

Kudos, SonarCloud Quality Gate passed!    Quality Gate passed

Bug A 0 Bugs
Vulnerability A 0 Vulnerabilities
Security Hotspot A 0 Security Hotspots
Code Smell A 1 Code Smell

91.5% 91.5% Coverage
0.0% 0.0% Duplication

@flo-dup flo-dup merged commit 03a6ff7 into main Feb 17, 2023
@flo-dup flo-dup deleted the merge-loads branch February 17, 2023 09:43
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Projects
None yet
Development

Successfully merging this pull request may close these issues.

Merge loads
4 participants